Glenn Morris [Tue, 12 Oct 2021 14:50:19 +0000 (07:50 -0700)]
; Merge from origin/emacs-28
The following commit was skipped:
665a184f87 Backport: * doc/misc/tramp.texi (Bug Reports): Describe, h...
Glenn Morris [Tue, 12 Oct 2021 14:50:19 +0000 (07:50 -0700)]
Merge from origin/emacs-28
0d374b1b83 Work around GCC bug 102671
Lars Ingebrigtsen [Tue, 12 Oct 2021 12:27:29 +0000 (14:27 +0200)]
Fix more Gnus group key bindings recently changed
* lisp/gnus/gnus-group.el (:keymap): Fix some prefix keys that
ended up in the wrong place during the keymap rewrite (bug#51136).
Stefan Kangas [Tue, 12 Oct 2021 12:04:21 +0000 (14:04 +0200)]
Remove more MH-E compat code
* lisp/mh-e/mh-e.el (mh-strip-package-version, defgroup-mh)
(defcustom-mh,
defface-mh): Make Emacs 21 compat aliases obsolete.
Update callers.
* lisp/mh-e/mh-e.el:
(mh-exchange-point-and-mark-preserving-active-mark)
* lisp/mh-e/mh-folder.el (desktop-buffer-mode-handlers):
* lisp/mh-e/mh-mime.el (mh-mm-inline-media-tests)
(mh-have-file-command, mh-mime-security-button-map):
* lisp/mh-e/mh-show.el (mh-summary-height):
* lisp/mh-e/mh-speed.el (mh-process-kill-without-query):
* lisp/mh-e/mh-xface.el (mh-uncompface-executable)
(mh-face-to-png, mh-uncompface, mh-picon-file-contents): Remove
XEmacs and Emacs 21 and older compat code.
Lars Ingebrigtsen [Tue, 12 Oct 2021 11:56:47 +0000 (13:56 +0200)]
Make dbus work in a dumped Emacs
* lisp/net/dbus.el (dbus--init): Make into a defun.
(after-pdump-load-hook): Put it onto the new pdump hook so that
it's run after startup (bug#37331).
Lars Ingebrigtsen [Tue, 12 Oct 2021 11:55:28 +0000 (13:55 +0200)]
Add a new after-pdump-load-hook variable
* doc/lispref/internals.texi (Building Emacs): Document it.
* lisp/subr.el (after-pdump-load-hook): New variable.
* src/emacs.c (main): Run the new hook.
* src/pdumper.c (syms_of_pdumper): Define a symbol.
Stefan Kangas [Tue, 12 Oct 2021 11:29:28 +0000 (13:29 +0200)]
Make mh-do-in-gnu-emacs obsolete
* lisp/mh-e/mh-acros.el (mh-do-in-gnu-emacs): Make obsolete.
* lisp/mh-e/mh-tool-bar.el: Don't use above obsolete macro.
(mh-acros): Require to avoid warnings.
Thanks to Lars Ingebrigtsen <larsi@gnus.org>.
Andreas Schwab [Tue, 12 Oct 2021 08:47:33 +0000 (10:47 +0200)]
Change --fingerprint to output to stdout
* src/pdumper.c (dump_fingerprint): Add argument OUTPUT, use it
instead of stderr, update all uses. Don't print colon if LABEL is
empty.
* src/pdumper.h (dump_fingerprint): Adjust.
* src/emacs.c (main): Print fingerprint to stdout, without label.
* Makefile.in (EMACS_PDMP): Adjust.
Martin Rudalics [Tue, 12 Oct 2021 07:53:57 +0000 (09:53 +0200)]
Have 'while-no-input-ignore-events' handle idle timers too (Bug#49997)
* src/keyboard.c (read_char): Use Vwhile_no_input_ignore_events to
check which idle timers should be resumed (Bug#49997).
(init_while_no_input_ignore_events): New function to
initialize Vwhile_no_input_ignore_events.
(Vwhile_no_input_ignore_events): Say in doc-string that events in
this list do not stop idle timers.
* lisp/subr.el (while-no-input): Remove initialization of
'while-no-input-ignore-events'; do that in keyboard.c now.
Stefan Monnier [Tue, 12 Oct 2021 00:55:19 +0000 (20:55 -0400)]
* list/erc/erc-{replace,imenu,dcc}: Tweak copyright format
* lisp/erc/erc-replace.el:
* lisp/erc/erc-imenu.el:
* lisp/erc/erc-dcc.el: Massage copyright so elpa-admin.el recognizes it
Stefan Kangas [Tue, 12 Oct 2021 00:35:23 +0000 (02:35 +0200)]
Remove last XEmacs compat code from ERC
* lisp/erc/erc-dcc.el (erc-dcc-member): Remove XEmacs compat code.
* lisp/erc/erc-goodies.el (erc-move-to-prompt-setup): Doc fix;
remove spurious reference to XEmacs; this is needed also for
Emacs.
Stefan Kangas [Tue, 12 Oct 2021 00:02:22 +0000 (02:02 +0200)]
Prefer setq-local in lisp/mh-e/*.el
* lisp/mh-e/mh-utils.el (mh-make-local-vars): Make obsolete.
* lisp/mh-e/mh-comp.el (mh-forward):
* lisp/mh-e/mh-folder.el (mh-folder-mode):
* lisp/mh-e/mh-identity.el (mh-identity-handler-signature)
(mh-identity-insert-attribution-verb):
* lisp/mh-e/mh-letter.el (mh-letter-mode):
* lisp/mh-e/mh-search.el (mh-search-folder):
* lisp/mh-e/mh-seq.el (mh-narrow-to-seq, mh-widen):
* lisp/mh-e/mh-show.el (mh-show-mode):
* lisp/mh-e/mh-tool-bar.el (mh-tool-bar-define):
* lisp/mh-e/mh-xface.el (mh-x-image-url-display)
(mh-x-image-url-fetch-image): Prefer setq-local.
Stefan Kangas [Mon, 11 Oct 2021 21:58:24 +0000 (23:58 +0200)]
Remove some more MH-E compat code
* lisp/mh-e/mh-acros.el (defun-mh, defmacro-mh): Make obsolete.
* lisp/mh-e/mh-gnus.el (mh-gnus-local-map-property): Make obsolete.
* lisp/mh-e/mh-mime.el (mh-insert-mime-security-button)
(mh-insert-mime-button): Don't use above obsolete function.
* lisp/mh-e/mh-gnus.el (mh-mm-text-html-renderer): Make obsolete.
* lisp/mh-e/mh-mime.el (mh-mm-inline-media-tests)
(mh-signature-highlight): Remove references to removed Gnus
variable 'mm-inline-text-html-renderer'.
* lisp/mh-e/mh-letter.el (mh-letter-complete): Make into obsolete
function alias for 'completion-at-point'. Update callers.
* lisp/mh-e/mh-e.el (mh-inc-spool-list, mh-show-use-xface-flag):
* lisp/mh-e/mh-comp.el (mh-ascii-buffer-p):
* lisp/mh-e/mh-show.el:
* lisp/mh-e/mh-utils.el: Remove some references to XEmacs.
* lisp/mh-e/mh-comp.el (mh-send-letter): Remove XEmacs and Emacs
compat code.
* lisp/mh-e/mh-compat.el (mh-display-completion-list): Remove
compat code for Emacs 22 and earlier.
* lisp/mh-e/mh-e.el (mh-inherit-face-flag)
(mh-min-colors-defined-flag): Make XEmacs and Emacs 21 compat
variables obsolete.
(mh-face-data): Adjust to assume above variables are always t.
* lisp/mh-e/mh-mime.el (mh-mime-button-map): Remove XEmacs and
Emacs 20 compat code.
* lisp/mh-e/mh-utils.el (mh-mapc): Make Emacs 20 compat function
into obsolete function alias for mapc. Update callers.
* lisp/mh-e/mh-xface.el (mh-show-xface-function, mh-show-xface):
Remove Emacs 20 compat code.
Stefan Kangas [Mon, 11 Oct 2021 20:57:43 +0000 (22:57 +0200)]
Remove redundant calls to 'mh-do-in-gnu-emacs'
* lisp/mh-e/mh-compat.el (mh-require):
* lisp/mh-e/mh-folder.el (mh-folder-mode):
* lisp/mh-e/mh-letter.el (mh-letter-mode):
* lisp/mh-e/mh-mime.el (mh-mime-button-map)
(mh-mime-security-button-map, mh-small-image-p)
(mh-signature-highlight):
* lisp/mh-e/mh-show.el (mh-show-mode):
* lisp/mh-e/mh-tool-bar.el (mh-tool-bar-define):
* lisp/mh-e/mh-utils.el (mh-logo-display)
(mh-hidden-header-keymap):
* lisp/mh-e/mh-xface.el (mh-face-display-function)
(mh-picon-image-types, mh-x-image-display): Remove redundant calls
to 'mh-do-in-gnu-emacs'.
* lisp/mh-e/mh-acros.el (mh-do-in-gnu-emacs):
* lisp/mh-e/mh-tool-bar.el: Add comment explaining an issue that
stops us from making 'mh-do-in-gnu-emacs' obsolete.
Michael Albinus [Mon, 11 Oct 2021 16:44:28 +0000 (18:44 +0200)]
; * test/src/emacs-module-tests.el: Instrument for bug#50902.
Michael Albinus [Mon, 11 Oct 2021 08:16:06 +0000 (10:16 +0200)]
Backport: * doc/misc/tramp.texi (Bug Reports): Describe, how to activate ELPA Tramp.
(cherry picked from commit
978e5339e0d4ef98575096bcf3ec2061ad530f27)
Paul Eggert [Mon, 11 Oct 2021 16:23:47 +0000 (09:23 -0700)]
Work around GCC bug 102671
This is for --enable-gcc-warnings on GCC 11.2.1.
* src/window.c, src/timefns.c: Disable -Wanalyzer-null-dereference.
Glenn Morris [Mon, 11 Oct 2021 15:22:00 +0000 (08:22 -0700)]
Fix merge error for elisp-mode-tests.el
* test/lisp/progmodes/elisp-mode-tests.el (test-cl-flet-indentation):
Delete test mistakenly restored by merge conflict.
It seems this was deleted 2021-10-01 with incomplete log message
"Add more indentation tests".
Glenn Morris [Mon, 11 Oct 2021 15:04:57 +0000 (08:04 -0700)]
Merge from origin/emacs-28
ac06608878 (origin/emacs-28) Release ERC 5.4
a1a589d07b * etc/ERC-NEWS: Announce ERC's addition to GNU ELPA.
6c7947f0a1 * etc/ERC-NEWS: Fix outline level for the recent additions.
c480b68644 Add ERC entries for 'customize-package-emacs-version-alist'
4afff515c8 Expand the full file name
36a485a1af Obsolete XEmacs compat convention in 'erc-button-press-but...
Glenn Morris [Mon, 11 Oct 2021 15:04:57 +0000 (08:04 -0700)]
; Merge from origin/emacs-28
The following commit was skipped:
31d60488ac Backport: Add ERC version to protocol log
Glenn Morris [Mon, 11 Oct 2021 15:04:57 +0000 (08:04 -0700)]
Merge from origin/emacs-28
1a1b206a8b Adapt the recent 'num_processors' change to MS-Windows
7cb4637923 Minor fix to clarify a sentence in emacs-lisp-intro
ab60144ea3 ; Pacify recent shorthand unused lexarg warnings.
e9df86004f Make tty-run-terminal-initialization load the .elc file (i...
07edc28bdb Fix ert errors when there's a test that binds `debug-on-er...
96278de8ac New function num-processors
575e626105 Add symbol property 'save-some-buffers-function' (bug#46374)
a3e10af95c Keep reading when typed RET in read-char-from-minibuffer a...
013e3be832 * lisp/userlock.el (ask-user-about-supersession-threat): A...
ae61d7a57d Fix point positioning on mouse clicks with non-zero line-h...
4c7e74c386 Complete shorthands to longhands for symbol-completing tables
c2513c5d0d Add new failing test for bug#51089
1d1e96377c ; * lisp/emacs-lisp/shortdoc.el: Fix typo.
6bf29072e9 Avoid mapping file names through 'substring'
bcce93f04c Update to Org 9.5-46-gb71474
5d408f1a24 Expanded testing of MH-E with multiple MH variants
b497add971 Fix Seccomp filter for newer GNU/Linux systems (Bug#51073).
75d9fbec88 Tramp code cleanup
# Conflicts:
# etc/NEWS
# test/lisp/progmodes/elisp-mode-tests.el
Amin Bandali [Mon, 11 Oct 2021 14:29:35 +0000 (10:29 -0400)]
Release ERC 5.4
* lisp/erc/erc.el (Version, erc-version): Bump to 5.4.
(customize-package-emacs-version-alist): Add entry for 5.4.
Amin Bandali [Mon, 11 Oct 2021 14:25:08 +0000 (10:25 -0400)]
* etc/ERC-NEWS: Announce ERC's addition to GNU ELPA.
Amin Bandali [Mon, 11 Oct 2021 14:13:56 +0000 (10:13 -0400)]
* etc/ERC-NEWS: Fix outline level for the recent additions.
Amin Bandali [Mon, 11 Oct 2021 14:04:44 +0000 (10:04 -0400)]
Add ERC entries for 'customize-package-emacs-version-alist'
* lisp/erc/erc.el (customize-package-emacs-version-alist): Add entries
for existing ERC versions.
Dmitry Gutov [Mon, 11 Oct 2021 13:37:55 +0000 (16:37 +0300)]
Expand the full file name
* lisp/vc/vc-git.el (vc-git--literal-pathspec):
Expand the full file name, not just the local part (bug#51112).
Stefan Kangas [Mon, 11 Oct 2021 13:39:17 +0000 (09:39 -0400)]
Obsolete XEmacs compat convention in 'erc-button-press-button'
* lisp/erc/erc-button.el (erc-button-press-button): Advertise new
calling convention without XEmacs compatibility.
Amin Bandali [Mon, 11 Oct 2021 13:34:41 +0000 (09:34 -0400)]
Revert "Obsolete XEmacs compat convention in erc-button-press-button"
This reverts commit
f146325bd1556d1acafe26f6c263b83a92d3cd20.
This should be done in 'emacs-28', which will be merged into 'master'.
F. Jason Park [Sat, 9 Oct 2021 12:59:43 +0000 (14:59 +0200)]
Backport: Add ERC version to protocol log
* lisp/erc/erc.el (erc-toggle-debug-irc-protocol): Include the erc
version in the debug logs (bug#51107).
(cherry picked from commit
13411346202f86e950bee076a5d528e98695fbb4)
Stefan Kangas [Mon, 11 Oct 2021 13:10:26 +0000 (15:10 +0200)]
Fontify "print" and "exec" as functions in python-mode
* lisp/progmodes/python.el (python-font-lock-keywords-level-2):
Fontify "print" and "exec" as functions, which is the case in
Python 3. (Bug#43298)
Eli Zaretskii [Mon, 11 Oct 2021 12:56:31 +0000 (15:56 +0300)]
Adapt the recent 'num_processors' change to MS-Windows
* nt/gnulib-cfg.mk (OMIT_GNULIB_MODULE_nproc): Omit nproc.
* src/w32.c (num_processors): New function.
* src/w32proc.c (Fw32_get_nproc): Remove.
Stefan Kangas [Mon, 11 Oct 2021 12:43:11 +0000 (14:43 +0200)]
Minor fix to clarify a sentence in emacs-lisp-intro
* doc/lispintro/emacs-lisp-intro.texi (Simple Extension): Add the word
"that" for clarity. (Bug#43965)
Lars Ingebrigtsen [Mon, 11 Oct 2021 12:42:33 +0000 (14:42 +0200)]
Mention --fingerprint in NEWS
Glenn Morris [Mon, 11 Oct 2021 12:03:26 +0000 (14:03 +0200)]
Make the installed pmdp file use a fingerprint
* Makefile.in (EMACS_PDMP): Use --fingerprint.
* doc/emacs/cmdargs.texi (Action Arguments): Document --fingerprint.
* src/emacs.c (load_pdump): Load the fingerprinted version of the
pdmp file (bug#42790).
(main): Support --fingerprint.
* src/pdumper.c (dump_fingerprint): Make non-static.
* src/pdumper.h: Declare dump_fingerprint.
Lars Ingebrigtsen [Mon, 11 Oct 2021 11:17:38 +0000 (13:17 +0200)]
Fix menu display of keys when cua-mode is active
* lisp/menu-bar.el (menu-bar-edit-menu): Make the menus display
the correct keys for editing when cua-mode is active (bug#28930).
Lars Ingebrigtsen [Mon, 11 Oct 2021 11:16:57 +0000 (13:16 +0200)]
Change how cua-mode defined `C-x' and `C-c'
* lisp/emulation/cua-base.el (cua-cut-handler):
(cua-copy-handler): New aliases (bug#28930).
(cua--init-keymaps): Use them for `C-x' and `C-c' to be able to
distinguish the commands when looking them up in reverse.
Lars Ingebrigtsen [Mon, 11 Oct 2021 11:15:41 +0000 (13:15 +0200)]
Allow :keys in menus to be computed dynamically
* doc/lispref/keymaps.texi (Extended Menu Items): Document it
(bug#28930).
* src/keyboard.c (parse_menu_item): Allow :keys to be a function.
Basil L. Contovounesios [Mon, 11 Oct 2021 10:55:40 +0000 (11:55 +0100)]
; Pacify recent shorthand unused lexarg warnings.
Lars Ingebrigtsen [Mon, 11 Oct 2021 09:22:05 +0000 (11:22 +0200)]
Make tty-run-terminal-initialization load the .elc file (if any)
* lisp/faces.el (tty-run-terminal-initialization):
`locate-library' may have found the .el.gz file (bug#51116).
Lars Ingebrigtsen [Mon, 11 Oct 2021 09:14:26 +0000 (11:14 +0200)]
Fix ert errors when there's a test that binds `debug-on-error'
* lisp/emacs-lisp/ert.el (ert--run-test-internal): Don't infloop
on errors when signalling errors (bug#51131).
Lars Ingebrigtsen [Mon, 11 Oct 2021 08:17:58 +0000 (10:17 +0200)]
Tweak how auto-fill fills after a period
* lisp/textmodes/fill.el (fill-nobreak-p): Don't break immediately
after a space after a period (bug#17321).
Michael Albinus [Mon, 11 Oct 2021 08:16:49 +0000 (10:16 +0200)]
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Michael Albinus [Mon, 11 Oct 2021 08:16:06 +0000 (10:16 +0200)]
* doc/misc/tramp.texi (Bug Reports): Describe, how to activate ELPA Tramp.
Paul Eggert [Sun, 10 Oct 2021 20:59:16 +0000 (13:59 -0700)]
New function num-processors
This addresses a FIXME comment in lisp/emacs-lisp/comp.el,
relating to the number of subsidiary processes used by
comp-run-async-workers in native compilation.
* admin/merge-gnulib (GNULIB_MODULES): Add nproc.
* doc/lispref/processes.texi (Process Information), etc/NEWS:
Document num-processors.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib/nproc.c, lib/nproc.h, m4/nproc.m4:
New files, copied from Gnulib by admin/merge-gnulib.
* lisp/emacs-lisp/comp.el (w32-get-nproc): Remove decl.
(comp-effective-async-max-jobs): Use num-processors.
* src/process.c: Include nproc.h.
(Fnum_processors): New function.
(syms_of_process): Define ‘all’, ‘current’, ‘num-processors’.
* src/w32proc.c (Fw32_get_nproc): Add FIXME comment.
* test/src/process-tests.el (process-num-processors): New test.
Juri Linkov [Sun, 10 Oct 2021 17:38:12 +0000 (20:38 +0300)]
Add symbol property 'save-some-buffers-function' (bug#46374)
* lisp/files.el (save-some-buffers-root): Put non-nil
symbol property 'save-some-buffers-function'.
(save-some-buffers): Check pred for the
symbol property 'save-some-buffers-function'.
(save-some-buffers-default-predicate): Mention
symbol property 'save-some-buffers-function'.
Juri Linkov [Sun, 10 Oct 2021 17:31:15 +0000 (20:31 +0300)]
Keep reading when typed RET in read-char-from-minibuffer and y-or-n-p
* lisp/subr.el (read-char-from-minibuffer-map):
Remap exit-minibuffer to read-char-from-minibuffer-insert-other.
(y-or-n-p-map): Remap 'exit' to y-or-n-p-insert-other.
(y-or-n-p): Don't mention RET in docstring. (Bug#51101)
David M. Koppelman [Sun, 10 Oct 2021 17:27:29 +0000 (20:27 +0300)]
* lisp/userlock.el (ask-user-about-supersession-threat): Accept 'y' strictly.
(Bug#51101)
Eli Zaretskii [Sun, 10 Oct 2021 14:14:55 +0000 (17:14 +0300)]
Fix point positioning on mouse clicks with non-zero line-height
* src/xdisp.c (move_it_to): After passing a newline, reset
it->override_ascent, like 'display_line' does (in
'append_space_for_newline'). (Bug#51111)
João Távora [Wed, 6 Oct 2021 10:30:29 +0000 (11:30 +0100)]
Complete shorthands to longhands for symbol-completing tables
Shorthands aren't symbols, they're text forms that 'read' into
symbols. As such, shorthands aren't candidates in these tables of
symbols. But in some situations, if no other candidates match the
pattern, we can e.g. complete "x-foo" to "xavier-foo" if the shorthand
(("x-" . "xavier-"))
is set up in the buffer of origin.
bug#50959
* lisp/help-fns.el (help--symbol-completion-table): Report
`symbol-help' category.
* lisp/minibuffer.el (completion-styles-alist): New 'shorthand'
style.
(completion-category-defaults): Link 'symbol-help' category with
'shorthand' style.
(minibuffer--original-buffer): New variable.
(completing-read-default): Setup minibuffer--original-buffer.
(completion-shorthand-try-completion)
(completion-shorthand-all-completions): New helpers.
João Távora [Sun, 10 Oct 2021 11:03:15 +0000 (12:03 +0100)]
Add new failing test for bug#51089
* test/lisp/progmodes/elisp-mode-tests.el
(elisp-dont-shadow-punctuation-only-symbols): Add new failing test.
Lars Ingebrigtsen [Sun, 10 Oct 2021 11:58:57 +0000 (13:58 +0200)]
Fix mairix-el.texi menu
Stefan Kangas [Sun, 10 Oct 2021 11:52:24 +0000 (13:52 +0200)]
; * lisp/emacs-lisp/shortdoc.el: Fix typo.
Dmitry Gutov [Sun, 10 Oct 2021 01:14:35 +0000 (04:14 +0300)]
Avoid mapping file names through 'substring'
* lisp/progmodes/project.el (project--files-in-directory):
Avoid mapping file names through 'substring'. Reducing the amount
of garbage generated. Better perf by up to 20%.
Bump the package version.
Kyle Meyer [Sat, 9 Oct 2021 20:34:12 +0000 (16:34 -0400)]
Update to Org 9.5-46-gb71474
Stephen Gildea [Sat, 9 Oct 2021 18:36:03 +0000 (11:36 -0700)]
Expanded testing of MH-E with multiple MH variants
* test/lisp/mh-e/mh-utils-tests.el: Environment variable TEST_MH_PATH
controls which installed MH variant to test with. Moved the commentary
about testing with different MH variants from above 'with-mh-test-env'
definition to "Commentary" section at the top of the file.
* test/lisp/mh-e/test-all-mh-variants.sh: New script to test all
installed MH variants.
Philipp Stephani [Sat, 9 Oct 2021 17:39:31 +0000 (19:39 +0200)]
Fix Seccomp filter for newer GNU/Linux systems (Bug#51073).
On some systems, process startup calls prctl(PR_CAPBSET_READ) via
'cap_get_bound'. We can just return EINVAL.
* lib-src/seccomp-filter.c (main): Add a rule for
prctl(PR_CAPBSET_READ, ...).
Michael Albinus [Sat, 9 Oct 2021 16:42:11 +0000 (18:42 +0200)]
Tramp code cleanup
* lisp/net/tramp.el (tramp-remote-path): Adapt docstring.
(tramp-action-login, tramp-action-password, tramp-action-yesno)
(tramp-action-yn, tramp-process-actions): Move let-binding of
`enable-recursive-minibuffers' up.
(tramp-handle-make-process, tramp-handle-write-region):
* lisp/net/tramp-adb.el (tramp-adb-handle-write-region)
(tramp-adb-handle-make-process):
* lisp/net/tramp-sh.el (tramp-sh-handle-make-process)
(tramp-sh-handle-write-region):
* lisp/net/tramp-smb.el (tramp-smb-handle-write-region):
* lisp/net/tramp-sshfs.el (tramp-sshfs-handle-write-region):
Use `string-or-null-p'.
Glenn Morris [Sat, 9 Oct 2021 14:50:36 +0000 (07:50 -0700)]
Merge from origin/emacs-28
394209c1a0 (origin/emacs-28) ; Fix indentation in etc/NEWS
81f20e8b89 Fix thinko in ls-lisp--insert-directory
ec9f25bd35 Mention that RET means "yes" in y-or-n-p
00eb21c897 ; * src/dispextern.h (struct glyph_string): Comment on NCH...
20eb3644ba Rewrite Antinews for Emacs 28
3a9b881603 ; * etc/NEWS: Rearrange the "incompatible changes" sections.
ebb7e26013 ; * etc/NEWS: Fix a typo.
315fe20086 ; * src/Makefile.in (../native-lisp): Add comment.
47cbd103f5 * lisp/bindings.el (mode-line-position): Improve tooltip.
35a752863a * lisp/progmodes/xref.el: Bump the version.
bbcd8cc1a9 Slight simplificaiton
e139dd1b1e Fix doc strings of 2 categories
59782839cb (xref--collect-matches-1): Remove some intermediate alloca...
1c7d056f4d ; Fix two typos where em dash was written as en dash
# Conflicts:
# etc/NEWS
Stefan Monnier [Sat, 9 Oct 2021 14:42:49 +0000 (10:42 -0400)]
* lisp/progmodes/bug-reference.el: Use new `eql` specializer syntax
Michael Albinus [Sat, 9 Oct 2021 14:42:00 +0000 (16:42 +0200)]
; Fix indentation in etc/NEWS
Michael Albinus [Sat, 9 Oct 2021 14:18:53 +0000 (16:18 +0200)]
Fix thinko in ls-lisp--insert-directory
* lisp/ls-lisp.el (ls-lisp--insert-directory): Ensure that
SWITCHES is a string.
Lars Ingebrigtsen [Sat, 9 Oct 2021 13:04:11 +0000 (15:04 +0200)]
Mention that RET means "yes" in y-or-n-p
* lisp/subr.el (y-or-n-p): Mention that RET also means yes (bug#51101).
F. Jason Park [Sat, 9 Oct 2021 12:59:43 +0000 (14:59 +0200)]
Add ERC version to protocol log
* lisp/erc/erc.el (erc-toggle-debug-irc-protocol): Include the erc
version in the debug logs (bug#51107).
Lars Ingebrigtsen [Sat, 9 Oct 2021 12:49:38 +0000 (14:49 +0200)]
Remove mistaken dired-x entry from previous info-look patch.
Lars Ingebrigtsen [Sat, 9 Oct 2021 12:44:21 +0000 (14:44 +0200)]
Make `C-h S' work on symbols from most of the manuals in Emacs
* lisp/info-look.el (lambda): Add `C-h S' lookup for all the
"misc" manuals in Emacs (bug#42753).
Lars Ingebrigtsen [Sat, 9 Oct 2021 12:43:47 +0000 (14:43 +0200)]
Add indices to mairix-el
* doc/misc/mairix-el.texi (Function Index): Add indices.
Eli Zaretskii [Sat, 9 Oct 2021 11:38:06 +0000 (14:38 +0300)]
; * src/dispextern.h (struct glyph_string): Comment on NCHARS. (Bug#51105)
Eli Zaretskii [Sat, 9 Oct 2021 11:32:28 +0000 (14:32 +0300)]
Rewrite Antinews for Emacs 28
* doc/lispref/anti.texi (Antinews):
* doc/emacs/anti.texi (Antinews): Rewrite for Emacs 28.
* doc/lispref/elisp.texi (Top):
* doc/emacs/emacs.texi (Top): Update menu accordingly.
Eli Zaretskii [Sat, 9 Oct 2021 11:30:31 +0000 (14:30 +0300)]
; * etc/NEWS: Rearrange the "incompatible changes" sections.
Lars Ingebrigtsen [Sat, 9 Oct 2021 11:12:33 +0000 (13:12 +0200)]
Simplify `clean-mode'
* lisp/simple.el (clean-mode): Simplify the property exclusion.
Eli Zaretskii [Sat, 9 Oct 2021 09:49:38 +0000 (12:49 +0300)]
; * etc/NEWS: Fix a typo.
Eli Zaretskii [Sat, 9 Oct 2021 08:23:44 +0000 (11:23 +0300)]
; * src/Makefile.in (../native-lisp): Add comment.
Stefan Kangas [Sat, 9 Oct 2021 06:48:34 +0000 (08:48 +0200)]
Remove duplicate definition of x-display-color-p
* lisp/emulation/viper-init.el (x-display-color-p): Remove duplicate
definition. This would just overwrite the alias defined in faces.el.
Stefan Kangas [Sat, 9 Oct 2021 06:32:25 +0000 (08:32 +0200)]
* lisp/bindings.el (mode-line-position): Improve tooltip.
Dmitry Gutov [Sat, 9 Oct 2021 01:38:11 +0000 (04:38 +0300)]
* lisp/progmodes/xref.el: Bump the version.
Dmitry Gutov [Sat, 9 Oct 2021 00:33:57 +0000 (03:33 +0300)]
Slight simplificaiton
* lisp/progmodes/xref.el (xref--insert-xrefs):
Compute log only once. Use 'dolist'.
Stefan Kangas [Sat, 9 Oct 2021 01:09:20 +0000 (03:09 +0200)]
Remove some unnecessary calls to mh-funcall-if-exists
* lisp/mh-e/mh-acros.el (mh-do-at-event-location):
* lisp/mh-e/mh-mime.el (mh-mime-cleanup, mh-display-smileys)
(mh-insert-mime-security-button, mh-insert-mime-button):
* lisp/mh-e/mh-show.el (mh-defun-show-buffer):
* lisp/mh-e/mh-xface.el (mh-x-image-url-fetch-image)
(mh-x-image-display, mh-picon-image-types): Remove unnecessary calls
to mh-funcall-if-exists; these functions always exist as they are
autoloaded.
Stefan Kangas [Sat, 9 Oct 2021 01:00:00 +0000 (03:00 +0200)]
Remove old Gnus compat code from MH-E
* lisp/mh-e/mh-gnus.el (mh-mm-merge-handles)
(mh-mm-set-handle-multipart-parameter, mh-mm-inline-text-vcard)
(mh-mm-possibly-verify-or-decrypt)
(mh-mm-handle-multipart-ctl-parameter, mh-mm-readable-p)
(mh-mm-long-lines-p, mh-mm-keep-viewer-alive-p)
(mh-mm-destroy-parts, mh-mm-uu-dissect-text-parts)
(mh-mml-minibuffer-read-disposition): Make into obsolete aliases
for functions without the 'mh-' prefix. Update callers.
(mh-gnus-local-map-property): Remove Emacs 20 compat code.
Stefan Monnier [Fri, 8 Oct 2021 22:36:29 +0000 (18:36 -0400)]
test/lisp/progmodes/elisp-mode-resources/simple-shorthand-test.el: Lexbind
Add the usual lexical-binding cookie.
Stefan Kangas [Fri, 8 Oct 2021 20:50:49 +0000 (22:50 +0200)]
Remove XEmacs compat code from lisp/obsolete/*.el
* lisp/obsolete/crisp.el (crisp-kill-region)
(crisp-region-active):
* lisp/obsolete/eudcb-ph.el (eudc-ph-open-session):
* lisp/obsolete/fast-lock.el (fast-lock-save-faces):
* lisp/obsolete/iswitchb.el (iswitchb-completion-help)
(iswitchb-case):
* lisp/obsolete/otodo-mode.el (todo-mode):
* lisp/obsolete/pgg-parse.el (pgg-parse-armor):
* lisp/obsolete/pgg.el (pgg-verify-region):
* lisp/obsolete/tpu-edt.el (activate-mark-hook, tpu-mark)
(tpu-set-mark, tpu-load-xkeys):
* lisp/obsolete/tpu-mapper.el (tpu-map-key, tpu-mapper): Remove XEmacs
compat code.
Stefan Kangas [Fri, 8 Oct 2021 19:04:04 +0000 (21:04 +0200)]
Remove XEmacs compat code from sql.el
* lisp/progmodes/sql.el (sql-interactive-mode-map, sql-mode)
(sql-interactive-mode): Remove XEmacs compat code. (Bug#51096)
Eli Zaretskii [Fri, 8 Oct 2021 19:20:19 +0000 (22:20 +0300)]
Fix doc strings of 2 categories
* lisp/international/characters.el (?R, ?L): Make the first line
of the categories' doc string shorter, to fit into 15 columns.
Stefan Kangas [Fri, 8 Oct 2021 19:02:14 +0000 (21:02 +0200)]
Remove Emacs 20 compat code from sql.el
* lisp/progmodes/sql.el (sql-input-ring-separator)
(sql-product-font-lock): Remove Emacs 20 compat code.
Stefan Kangas [Fri, 8 Oct 2021 18:41:50 +0000 (20:41 +0200)]
Remove some additional XEmacs compat code from viper
* lisp/emulation/viper-util.el (viper-memq-char): Make into
obsolete function alias for 'memq'. Update callers.
(viper-char-equal): Make into obsolete function alias for 'eq'.
Update callers.
(viper-color-display-p): Make into obsolete function alias for
'x-display-color-p'. Update callers.
Stefan Kangas [Fri, 8 Oct 2021 18:25:52 +0000 (20:25 +0200)]
Obsolete XEmacs compat convention in erc-button-press-button
* lisp/erc/erc-button.el (erc-button-press-button): Advertise new
calling convention without XEmacs compatibility.
Dmitry Gutov [Fri, 8 Oct 2021 15:25:55 +0000 (18:25 +0300)]
(xref--collect-matches-1): Remove some intermediate allocations
* lisp/progmodes/xref.el: (xref--collect-matches-1):
Rewrite to remove some intermediate allocations.
Modest performance improvement.
Stefan Kangas [Fri, 8 Oct 2021 14:50:32 +0000 (16:50 +0200)]
; Fix two typos where em dash was written as en dash
Glenn Morris [Fri, 8 Oct 2021 14:50:28 +0000 (07:50 -0700)]
Merge from origin/emacs-28
af01b674ce (origin/emacs-28) ; Fix spacing in previous commit
915e044d60 Use the correct label in the warning
6e83a4100a ; * admin/make-tarball.txt: Should configure --with-native...
525602d682 ; * etc/TODO (display): Add entry about Default_Ignorables.
65de510c16 ; Fix 'restore-buffer-modified-p' doc string typo
9d8202b45e Add Emacs 27 compatibility hack
89d64fca75 Pacify GCC 10.3 -Wmaybe-uninitialized
bb8ef1aa30 * lisp/tab-bar.el (tab-detach, tab-window-detach): New ali...
7ae70054aa ; * src/composite.h (LGSTRING_FONT): Add comment about its...
1af00e67d6 Include the refcards in the release tarball
3c29fb705c ; * src/Makefile.in (../native-lisp): Make the long recipe...
Tassilo Horn [Fri, 8 Oct 2021 11:03:45 +0000 (13:03 +0200)]
; Fix spacing in previous commit
Arash Esbati [Fri, 8 Oct 2021 09:12:30 +0000 (11:12 +0200)]
Use the correct label in the warning
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label): Add
missing space in the prompt. Use the new user defined label in
the warning (bug#36235).
Eli Zaretskii [Fri, 8 Oct 2021 07:31:17 +0000 (10:31 +0300)]
; * admin/make-tarball.txt: Should configure --with-native-compilation.
Eli Zaretskii [Fri, 8 Oct 2021 07:27:03 +0000 (10:27 +0300)]
; * etc/TODO (display): Add entry about Default_Ignorables.
Stephen Gildea [Fri, 8 Oct 2021 03:10:09 +0000 (20:10 -0700)]
; Fix 'restore-buffer-modified-p' doc string typo
* src/buffer.c (restore-buffer-modified-p): Fix typo in doc string:
"and" for "or" regarding lock/unlock. Note that 'set-buffer-modified-p'
doc string already uses the correct "or".
Dmitry Gutov [Fri, 8 Oct 2021 02:23:19 +0000 (05:23 +0300)]
Add Emacs 27 compatibility hack
* lisp/progmodes/xref.el: Add Emacs 27 compatibility hack, for the
standalone version of this package.
Stefan Kangas [Thu, 7 Oct 2021 15:10:07 +0000 (17:10 +0200)]
Make mh-* XEmacs compat aliases obsolete
* lisp/mh-e/mh-acros.el (mh-make-local-hook): Make XEmacs and Emacs 20
macro obsolete. Update all callers
* lisp/mh-e/mh-compat.el (mh-require): Make XEmacs compat alias
obsolete. Update all callers
(mh-write-file-functions): Make XEmacs compat macro obsolete. Update
all callers
(mh-assoc-string, mh-display-color-cells, mh-face-foreground)
(mh-face-foreground, mh-face-background)
(mh-font-lock-add-keywords, mh-image-load-path-for-library)
(mh-image-search-load-path, mh-line-beginning-position)
(mh-line-end-position, mh-mail-abbrev-make-syntax-table)
(mh-define-obsolete-variable-alias, mh-make-obsolete-variable)
(mh-match-string-no-properties, mh-replace-regexp-in-string)
(mh-test-completion, mh-url-hexify-string, mh-view-mode-enter)
(mh-window-full-height-p): Make XEmacs compat definitions into
obsolete function aliases for the same names but without the "mh-"
prefix. Update all callers.
Paul Eggert [Thu, 7 Oct 2021 20:09:19 +0000 (13:09 -0700)]
Pacify GCC 10.3 -Wmaybe-uninitialized
Problem reported by Basil L. Contovounesios (Bug#51075).
* src/term.c (encode_terminal_code):
Add an UNINIT to pacify GCC 10 bug.
Lars Ingebrigtsen [Thu, 7 Oct 2021 19:10:34 +0000 (21:10 +0200)]
Update inhibit-changing-match-data obsoletion data
* lisp/subr.el (inhibit-changing-match-data): Link to
`save-match-data'.
Eli Zaretskii [Thu, 7 Oct 2021 19:01:57 +0000 (22:01 +0300)]
; * etc/NEWS: Fix a typo.
Lars Ingebrigtsen [Thu, 7 Oct 2021 18:55:05 +0000 (20:55 +0200)]
Update Fstring_match calls in comp.c
* src/comp.c (Fcomp_el_to_eln_rel_filename, file_in_eln_sys_dir):
Update Fstring_match calls.
Lars Ingebrigtsen [Thu, 7 Oct 2021 18:46:50 +0000 (20:46 +0200)]
Make 'inhibit-changing-match-data' obsolete and adjust callers
* doc/lispref/searching.texi (Regexp Search):
(POSIX Regexps): Document this.
* lisp/subr.el (inhibit-changing-match-data): Make obsolete.
(looking-at-p): Adjust call.
* lisp/vc/vc-hg.el (vc-hg--raw-dirstate-search):
(vc-hg--ignore-patterns-ignored-p):
(vc-hg--cached-dirstate-search): Don't use
`inhibit-changing-match-data'.
* src/minibuf.c (Ftry_completion):
(Fall_completions):
(Ftest_completion): Adjust Fstring_match calls.
* src/search.c (looking_at_1): Pass in modify_data.
(Flooking_at): Add optional inhibit-modify parameter.
(string_match_1): Pass in modify_data.
(Fstring_match):
(Fposix_looking_at, Fposix_string_match): Add optional
inhibit-modify parameter.